Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 22 Sep 2011 23:00:51 +0000 (16:00 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 22 Sep 2011 23:00:51 +0000 (16:00 -0700)

Trivial merge